Minor test changes: bust a few tests out and fix diff orders.

diff --git a/gpsbabel/testo.d/classic-3.test b/gpsbabel/testo.d/classic-3.test
index d587a745ccacf2b616a9cea01f41b3d34bbf9995..8720be9d1ef6846ad0529b9cb225c76ad82796df 100644 (file)
--- a/gpsbabel/testo.d/classic-3.test
+++ b/gpsbabel/testo.d/classic-3.test
@@ -40,13 +40,6 @@ compare ${REFERENCE}/route/nmn4-sample.gpx ${TMPDIR}/nmn4-sample.gpx
 gpsbabel -i gpx -f ${REFERENCE}/route/nmn4-sample.gpx -o nmn4 -F ${TMPDIR}/nmn4-sample-out.rte
 compare ${REFERENCE}/route/nmn4-sample-out.rte ${TMPDIR}/nmn4-sample-out.rte
 
-#
-# Map&Guide Palm/OS .pdb files (read-only)
-#
-rm -f ${TMPDIR}/mag_pdb-*
-gpsbabel -i mag_pdb -f ${REFERENCE}/route/mag_pdb-sample.pdb -o gpx -F ${TMPDIR}/mag_pdb-sample.gpx
-compare ${TMPDIR}/mag_pdb-sample.gpx ${REFERENCE}/route/mag_pdb-sample.gpx
-
 #
 # Testing the 'nuketypes' filter is funky.
 # Convert a GPX file to GPX to eliminate jitter.
@@ -150,15 +143,6 @@ compare ${REFERENCE}/compegps-wpt.gpx ${TMPDIR}/compegps-wpt.gpx
 gpsbabel -i cst -f ${REFERENCE}/route/cst-sample.cst.gz -o gpx -F ${TMPDIR}/cst-sample.gpx
 compare ${TMPDIR}/cst-sample.gpx ${REFERENCE}/route/cst-sample.gpx
 
-#
-# Transformation filter (transform) tests
-#
-rm -f ${TMPDIR}/transform*
-gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -x nuketypes,routes,tracks -x transform,rte=wpt,del=y -o gpx,gpxver=1.1 -F ${TMPDIR}/transform-rte.gpx
-compare ${TMPDIR}/transform-rte.gpx ${REFERENCE}/transform-rte.gpx
-gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -x nuketypes,waypoints,tracks -x transform,wpt=rte,del=y -o gpx,gpxver=1.1 -F ${TMPDIR}/transform-wpt.gpx
-compare ${TMPDIR}/transform-wpt.gpx ${REFERENCE}/transform-wpt.gpx
-
 #
 # GPX version detection
 #

diff --git a/gpsbabel/testo.d/mag_pdb.test b/gpsbabel/testo.d/mag_pdb.test
new file mode 100644 (file)
index 0000000..4c4d57e
--- /dev/null
+++ b/gpsbabel/testo.d/mag_pdb.test
@@ -0,0 +1,7 @@
+#
+# Map&Guide Palm/OS .pdb files (read-only)
+#
+rm -f ${TMPDIR}/mag_pdb-*
+gpsbabel -i mag_pdb -f ${REFERENCE}/route/mag_pdb-sample.pdb -o gpx -F ${TMPDIR}/mag_pdb-sample.gpx
+compare ${REFERENCE}/route/mag_pdb-sample.gpx ${TMPDIR}/mag_pdb-sample.gpx 
+

diff --git a/gpsbabel/testo.d/mtk_locus.test b/gpsbabel/testo.d/mtk_locus.test
index 98c114cd51c50f09a336ff314a1a2d681d608aa6..9fe9bbd8f57cf3eeebcd11a236248d74689d1f5c 100644 (file)
--- a/gpsbabel/testo.d/mtk_locus.test
+++ b/gpsbabel/testo.d/mtk_locus.test
@@ -6,4 +6,4 @@ FORMAT=mtk_locus
 rm -f ${TMPDIR}/$FORMAT.*
 
 gpsbabel -i $FORMAT -f ${REFERENCE}/$FORMAT.nmea -o gpx -F ${TMPDIR}/$FORMAT.gpx >/dev/null
-compare ${TMPDIR}/$FORMAT.gpx ${REFERENCE}/$FORMAT.gpx
+compare ${REFERENCE}/$FORMAT.gpx ${TMPDIR}/$FORMAT.gpx 

diff --git a/gpsbabel/testo.d/transform.test b/gpsbabel/testo.d/transform.test
new file mode 100644 (file)
index 0000000..10dc9ed
--- /dev/null
+++ b/gpsbabel/testo.d/transform.test
@@ -0,0 +1,9 @@
+#
+# Transformation filter (transform) tests
+#
+rm -f ${TMPDIR}/transform*
+gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -x nuketypes,routes,tracks -x transform,rte=wpt,del=y -o gpx,gpxver=1.1 -F ${TMPDIR}/transform-rte.gpx
+compare ${REFERENCE}/transform-rte.gpx ${TMPDIR}/transform-rte.gpx 
+gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -x nuketypes,waypoints,tracks -x transform,wpt=rte,del=y -o gpx,gpxver=1.1 -F ${TMPDIR}/transform-wpt.gpx
+compare ${REFERENCE}/transform-wpt.gpx ${TMPDIR}/transform-wpt.gpx 
+